Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 23 Apr 2010 22:30:27 +0000 (22:30 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 23 Apr 2010 22:30:27 +0000 (22:30 +0000)
commit3554f3d0043b64ae5774dc494ca00b9c4c2b68b2
tree9d599f5c4f90fcdbca8d0e1f178f207ffbd43f73
parent6aa9efabf9ff81af966356c6c77f40152df585b3
parentcce1ab2b1170ac31a6b8b22e70ea694e4511a9b2
Merge from mainline.